Merge "Refactor Cdma preference in ECM"