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

Change-Id: I5b62f164478762bcd74ac9a051fb942fb70defaa