Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 31f0d18a03  -s ours
am: cb60be1c2a  -s ours

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