am d911880b: am acf206bc: Merge "Add imap2 to the build" into jb-mr1-dev

* commit 'd911880b25f2b3c55c05de54fe498eb6e24a0411':
  Add imap2 to the build