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

* commit '451dc7e146551c09d5d199113d484f07923d7086':
  Import translations. DO NOT MERGE

Change-Id: I60fa4a5769253b23c49b9170d7200ca68b64c37d