Merge "Ensure original connection extras are propagated to telecom." into mnc-dr-dev