Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 29f649f43a  -s ours
am: 1f6fbd93d1  -s ours

* commit '1f6fbd93d12cc2862e61acadd23bf8ce8e1f6d3f':
  Import translations. DO NOT MERGE