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

Change-Id: Ia9551bd60a73a4eb1286931505183a3e25d29d29