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

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

Change-Id: Icd4feb6bdc208a861f57a14395fc2be32c5fe1c1