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

Change-Id: I3a730f5101435e056e39790dead219cec4335880