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

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

Change-Id: Ib5c78501d663cb22dc7b128e2a6a63664ff1c91d