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

Change-Id: I85fd4ac952d4958fa92b2bf0cda260ad5b5fbae1