[automerger skipped] Import translations. DO NOT MERGE am: 84568fbbad -s ours am: b25d35ca46 -s ours

am skip reason: subject contains skip directive

Change-Id: I1b665a97121a56f498184a1c2cb6f7d351e4d486