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

Change-Id: Ic70bc275a19e5421583b28e074ebdb435a02b2ea