Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 5ac773c8f7 -s ours
* commit '5ac773c8f7a6edef2d72fb9ce1b2fd8a90740978':
Import translations. DO NOT MERGE
Change-Id: I52f42bcf1cfd40e4c90e17ae15651954d01915e6
This commit is contained in: