Merge "Add flags to deprecate and clean up CDMA" into main