Merge \\"Proper IMAP logout\\" into nyc-mr1-dev am: 8065a4b72b
am: a600a80217

Change-Id: I2fa68722d8f0d6a8f4e21d119988dfe909518063