Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 18891008dc  -s ours
am: 3487bfe04e  -s ours

Change-Id: I1adca487e6b8db61f08af2eadae52a3f36ea1464