[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a86673c41  -s ours am: 248a23d07b  -s ours
am: 9e2873bdf1  -s ours

Change-Id: Icb0ec26a28f88f1af6a19c1259f82eeae6a23df2