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

Change-Id: I7b12b5dd06b50c636f2511ec0f6e5dd30a631bd1