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

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

Change-Id: I4c4da499fab8a30733235849a336876442e46125