Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 196c7f7 -s ours
* commit '196c7f74dbb1a30bc3898e607f8a70a8233abc65':
Import translations. DO NOT MERGE
Change-Id: I8b9ce1df4ddebca2b4fa9e66d65d80b280586f14
This commit is contained in: