Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e  -s ours
am: 42d8dccd89  -s ours

* commit '42d8dccd89ca310e943cdab0ae188cdf9da08cb4':
  Import translations. DO NOT MERGE

Change-Id: I57045ccd9866bf453cfec08f89a1b7d94c4b561e