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

* commit '7fa7ad595f167decec1f6cef8b64c955b684b6b1':
  Import translations. DO NOT MERGE

Change-Id: I02713845555de76262cfc732243004702bfc72bb