Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 23b665d65c -s ours
* commit '23b665d65cd06c38a3ffb8301f4b47ca00eaa5a3':
Import translations. DO NOT MERGE
Change-Id: I5de0c8f54bd25c5d3408ebc7fa3f821474be843b
This commit is contained in: