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

* commit '93f97c07f6a505ec5e81b27745a79deb4be48335':
  Import translations. DO NOT MERGE

Change-Id: Ia45121c428293b9e3a9cdb6117dcc53bf67df50b