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

Change-Id: Ic0ebba84ca5dfedd88b08c334de5e31de5cedc20