Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 93be386157  -s ours am: 086c57be76  -s ours
am: 20fee8e668  -s ours

Change-Id: Iff98c6dc6296053f8866d84aa3aaf9129aa76be6