Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 30fc04a -s ours
* commit '30fc04a99cb84058319abdf16b8c5f144c9b1924':
Import translations. DO NOT MERGE
Change-Id: I41d8de22a1800edd3f050372c8fda3a36da0b9c1
This commit is contained in: