Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: d882cca4de  -s ours

Change-Id: I2dfbcd8e9b1da2f068e685119e97f6d4e13dabdd