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

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

Change-Id: I17af720d1549bc29d2f8a823d529d2d9429671ee