[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c70114e46b -s ours
am: 2e6afa3dad -s ours
am skip reason: subject contains skip directive

Change-Id: Ib595fe5c37ed165baf2339b907ccea0ed9e2e7b0