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

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

Change-Id: Ia6869ed50d88aea53c3c42e02337eaecf1dd870f