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

Change-Id: I02065195a90cbedb96abafe734cd4d4ce2295022