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

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

Change-Id: I41ff4f7082929c56103d903cf417e9fb306d6639