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

Change-Id: I17724c446841088e5298753ffbd9499e51a46bd3