Merge "Import translations. DO NOT MERGE am: aa29f638f6  -s ours" into nyc-mr1-dev-plus-aosp
am: f03a397b73  -s ours

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

Change-Id: I5e55c34c1291bda5cdfdba48c6106acc5d7280f0