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

Change-Id: Iac3a6f1f2fa94f997220a0acc5cbbcacc3eb1269