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

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

Change-Id: Ic08e6e8dcb28ab89c072abe20633c71d7695277e