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

* commit 'b6a186ce5226c9f69b625f1fd016a5a7186bc2ff':
  Import translations. DO NOT MERGE

Change-Id: Ia5432922cf53443a67610b3ea378013ca1cd9649