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

Change-Id: I4231d81dffd3f8fb726b67fc77f57af69087b569