[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 8ae70f1a14 -s ours
am skip reason: subject contains skip directive

Change-Id: I74ef77e677578e20f8a2037c690388b95ea47a8b