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

* commit '917ead578baa6fba7e8e45756c67c879bb912364':
  Import translations. DO NOT MERGE

Change-Id: If76389179f7a687e1eefa96f629664b7e7bdbb21