[automerger skipped] Import translations. DO NOT MERGE am: 9b767fcba3 -s ours am: 840c5538d5 -s ours
am: 2a4aba0879 -s ours
am skip reason: subject contains skip directive

Change-Id: Iea8a6a26c95686c4e13daa137d6b9a87723cc0de