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

Change-Id: Ie4344d94b9e58d4fd8299723b6780c725a10de41