Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d46d030238  -s ours
am: ca4daf90e0  -s ours

Change-Id: I2a4186b26c2d5e9dc98cdcb717e62d71e844809a