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

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

Change-Id: Ia8f57a4a6699d27c2dd182719a15e0af34e844ce