cherrypick: Check for duplicated mailboxes and correct if found

Bug: 7232680
Change-Id: Id4d0328c7d8ff0c05442a429b43b92c846ce8f48
2 files changed