Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4' * commit '386278a338d740dce95b7fa1514662b0eb5683e4': CDMA Settings additions
Merge commit '386278a338d740dce95b7fa1514662b0eb5683e4' * commit '386278a338d740dce95b7fa1514662b0eb5683e4': CDMA Settings additions