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

* commit '24708d9c8e54701d6c3ee20f72e8dfb09d0f5c75':
  Import translations. DO NOT MERGE

Change-Id: Id96597e05d8bb1b74a9290445f76c0b645e238b3