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

Change-Id: Ic6c474944a6a0a6b0a1a301f3ccd4a8e891ff073