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

Change-Id: I2298519e9de20f860881621ca23ddd59b10f543d