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

* commit '26c1e22e294697a2b1494e95a1b66639923c5679':
  Import translations. DO NOT MERGE

Change-Id: I57b5810b88baf614ab4558a1b71e5a95286905ea