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

Change-Id: I233911ec0fe5b8ff324e25ac47a0a4892a409232