Merge "Import translations. DO NOT MERGE" into nyc-dev
am: c6b8f90 -s ours
* commit 'c6b8f90f9911787f63cff761bbd23f7a9d525847':
Import translations. DO NOT MERGE
Change-Id: Icfc68346bc06c907ff78c92fb6fe66524b68a6e9
This commit is contained in: