Merge commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7' * commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7': Simplify CDMA Status Bar icons
Merge commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7' * commit 'c3b64a41d959428971c99185da3b629e1cbaeaf7': Simplify CDMA Status Bar icons