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

* commit '75437ce8f4373862a930c8e1bac4acc0156cb561':
  cherrypick: Check for duplicated mailboxes and correct if found