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

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

Change-Id: I8882aff1a855955ccb6b1be0b9ff5afdd61c34e9