Merge "Make ImapHelper constructor throw" into nyc-mr1-dev