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

Change-Id: Iebc2e3f4a1dccb8f50b415a4f1d91df3ba501c4e