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

* commit '23b665d65cd06c38a3ffb8301f4b47ca00eaa5a3':
  Import translations. DO NOT MERGE

Change-Id: Ie2e6a2515d39cd5284946abba39f9800d020d32b