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

Change-Id: I6127c59df61f68ba301224d8cf08cba8093fe19f