Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2c6f7366fc  -s ours

Change-Id: Ibb384b268ce40bfded2d65dc5153a9a2346b25f6