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

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

Change-Id: Ib64bfe467ed10f2f513cbaf3b6f6cfd892d6230d