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

Change-Id: I562b84df14b7c7e480696c68338c84b9819e0f22