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

* commit 'e71cdef7e307aff6326a5790d98a044bdfcec84c':
  Import translations. DO NOT MERGE

Change-Id: I2180ff991e0f2a3969dc13b44931a9cf6a639f24