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

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

Change-Id: I518ae421e6d9b50fc859b3baff97798dacf3fbc5