Merge "Deprecate CDMA" into main