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

* commit 'efc306b7bb6f2f886fa0f5cbe477bc4784ec6e95':
  Import translations. DO NOT MERGE