am 4c186927: am 75437ce8: Merge "cherrypick: Check for duplicated mailboxes and correct if found" into jb-mr1-dev

* commit '4c18692772234aff1d27c0d8c604c5099c3b2774':
  cherrypick: Check for duplicated mailboxes and correct if found