Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23  -s ours
am: 1ba6831726  -s ours

* commit '1ba6831726f2f72019a0bca2f44d9e8be7575e09':
  Import translations. DO NOT MERGE

Change-Id: I02ae6d45f9ce9532212a27000d1d1bd983a758ae