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

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I320c2898acb42393e12e98e2b750bbc854f634d2