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

Change-Id: I93c24453b6a5820754d048b671ce22cc304fce9b