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

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

Change-Id: Ief5487eae91a182dc77ce0c6a0413f7e754ea1b6