[automerger skipped] Import translations. DO NOT MERGE am: 6b2c43a4af  -s ours
am: 6ba0a1eb9f  -s ours

Change-Id: If1801ef17b009c1a09cd8d53e14627bda8f51968