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

* commit '44983082a7d244a86dfd3b90094784507eadf119':
  Import translations. DO NOT MERGE

Change-Id: Ie5173264990fbd1b6a01960eadf68de986ae5320