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