Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fb559183f  -s ours
am: 7edeb95b59  -s ours

Change-Id: Iba0a82ad3757259bcaf4a211f656cb7c09da39d2