Merge \"Make ImapHelper constructor throw\" into nyc-mr1-dev
am: 0cd80c3420

Change-Id: I05f709a19d7c4f59edfae73dbbd3adaaf7694689