Merge "Import translations. DO NOT MERGE" into nyc-dev am: d28707d9f1  -s ours am: 156979ec3e  -s ours
am: 51f876519e  -s ours

* commit '51f876519ec5d1eee15ad7873b0f991bb0b9df65':
  Import translations. DO NOT MERGE

Change-Id: Ibd7b84e5b041ae6eced42a5c4c5c13d677020fa1