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

* commit '5a45cf7098b020dac2f7a8e3140ff52b584203a7':
  Import translations. DO NOT MERGE

Change-Id: I5701d8e57d6683ed99568e3614e9676a16854c32