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

Change-Id: I6fe5c2406064f4d308e196c9e92037234a3f8a38