Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am: 64e0910859  -s ours

Change-Id: I056ff501980e58d5ace3fa6c3aa07c66d20bebe2