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

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

Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4