Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: c3acddbb75  -s ours am: f68f600ca8  -s ours
am: 0a0bebb59d  -s ours

Change-Id: Ie9ece4967988444ada4e298147e2f768376c9ec2