Merge "Import translations. DO NOT MERGE" into nyc-dev am: 30fc04a  -s ours
am: 11055ea  -s ours

* commit '11055ead2d6f3c47e5f27c8680ecd8cedd2f541e':
  Import translations. DO NOT MERGE

Change-Id: Id69a0818193cb11625b13dbf28256fa2bb6952c1