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

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

Change-Id: I4ca603cdefb3c97bc2544d0e36da7b39453cc2b5