Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 1fc63da0e5  -s ours
am: 709844aed4  -s ours

Change-Id: I557182d2ee720189fb033def3c48698f11d81e40