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

Change-Id: Ied3b03a39ae0ef882dbac8c8f7dcf62587056e1f