Merge "Resolve telephony property dependency in telecom" into main