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

* commit '30fc04a99cb84058319abdf16b8c5f144c9b1924':
  Import translations. DO NOT MERGE

Change-Id: Id19de9def71b1fb00a5a928f99b32e33741c2d5f