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