Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 53471c1876  -s ours
am: 2958fc755d  -s ours

* commit '2958fc755defa49c7609dfbf9e1f6a2bf49356f3':
  Import translations. DO NOT MERGE

Change-Id: I6e612b034bbad47e7b6166ae2d2b953adc2eeeae