[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e4792b3964  -s ours

Change-Id: I81c4ce8de849e2d3583ca20db5cd072cc8ab2ac9