Merge commit '7250f938accad16e878889c6f4d8be3b8520f510' * commit '7250f938accad16e878889c6f4d8be3b8520f510': Simplify data icons of CDMA in status bar.
Merge commit '7250f938accad16e878889c6f4d8be3b8520f510' * commit '7250f938accad16e878889c6f4d8be3b8520f510': Simplify data icons of CDMA in status bar.