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

Change-Id: I772e5ea1e784322fe2fcfdf5b9a6f445d4749cbc