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

Change-Id: I6191fe0a0b48508149189c391f106d9783f8ffd2