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

* commit '83378cb13689fa73be349a9ce4b0802ed64fc935':
  Import translations. DO NOT MERGE

Change-Id: Id406199ec77f14e947db6f7c65a2f3b65795374d