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

Change-Id: I2e6c7cfec6218d6d3b3001db11c725b4f2dc614d