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

Change-Id: Ic0c5b7a3a8cd712208857abe3fb9605e899475c5