Merge "Move RCS specific canonical address handling"