Merge "AOSP/UnifiedEmail - Replace IMAP with POP3 in tests." am: c5f68f87fc
am: 325d15f0d2

Change-Id: Id99ac3154d34f39f3c4234b7002e7256a507a06c