Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 634fc5a417  -s ours am: efa89be550  -s ours
am: 2e570aae72  -s ours

Change-Id: Iab41fe2f86255e0ac6f174a3b121cc850d8a13e7