Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 46aaf3e039  -s ours
am: f33988386b  -s ours

Change-Id: Ib5b85699bb848c1b495d54f3350bd7cd3acb5cc5