Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9aed8c2fa0 -s ours
* commit '9aed8c2fa01785be20cd7cc07976670812bc84a0':
Import translations. DO NOT MERGE
Change-Id: Ia3070d2cf441bdcd63f39ff90b8c77da1c37fc16
This commit is contained in: