Merge "Ensure TelecomAccountRegistry is HSUM aware." into main