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

Change-Id: Idfb1bf95e80395e1739a63843a09ea6a37287dbf