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

* commit '9058fc71c292823f746b514d91b0dfdad8b20893':
  Import translations. DO NOT MERGE

Change-Id: I40dee41684b31c22023e0034b5cf1f3f6fd5a0eb