Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5495ee8a9b  -s ours
am: 967f81f5d7  -s ours

* commit '967f81f5d71312e0978ac72420a589a26f86e1ec':
  Import translations. DO NOT MERGE