Merge "Fix CDMA roaming and subscription mode tests"