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

Change-Id: Ifb056a801040c094a25ccb1e9d51f82db32f6d40