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

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

Change-Id: I9c86eaa2a2c9a210cae416424b1b21042529a4a2