Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: a741a1e2a7  -s ours
am: d898c014fa  -s ours

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

Change-Id: Ie1ff34f20168ba782d84f5a4316b1b3ef02f2e1a