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

* commit '9d8adcbaff15e06653e73cf6ef5ad3a33a8fe6a8':
  Import translations. DO NOT MERGE

Change-Id: I75a436e8d35cfa7df9d5cc9a7c1938fbe28824a2