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

Change-Id: I5ba367cb854039a4de86a36808296242e0258e3d