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

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

Change-Id: I21c3a2c6d394ab6b41f1b17aeb093b0bba5cc140