am cbc76741: am 9ab4553e: Merge "Remove extra Imap authenticator" into jb-ub-mail-ur9

* commit 'cbc76741cc5b9bd9ca8b948c10292cff9e6a076d':
  Remove extra Imap authenticator