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

Change-Id: Icbdc4c2b98737adce95437613b0d0fc846a5a7e9