Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23  -s ours am: f107987432  -s ours" into nyc-mr1-dev-plus-aosp
am: bb346a929f  -s ours

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

Change-Id: I8729a050dcdd7fd99ecc290a86903067e303da75