Check for duplicated mailboxes and correct if found

Bug: 6578066
Change-Id: If607c44dca098dd53fa6fc51de69af022dc7de51
2 files changed