Merge "Resolve Telecom UserManager/UserInfo references" into main