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

* commit '7533f3260e888c6edc709b02eafdb5722172ecc2':
  Import translations. DO NOT MERGE

Change-Id: I1eeeb4510ca635af93a97af9950dc2b54914199b