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

* commit '85964c84f5f5797001dfa8bb69939cc41e16d096':
  Import translations. DO NOT MERGE

Change-Id: Iff27c0f5a87e7d3b10cb5dce2712611ba199baba