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

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

Change-Id: Ie23ebc312c113a27aae6b8dbde5d6512145eee92