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

Change-Id: I8b8d63dd693e98d5070dc48bf8c225a7f77aa674