Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93bc210b3f -s ours
* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
Import translations. DO NOT MERGE
Change-Id: Ia8b0a47a38207e1d2c85f97f0e771281512d1e9c
This commit is contained in: