Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp * commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750': Refine fix I53e91db7 to apply only to wifi network
Merge commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750' into eclair-plus-aosp * commit '5381e4ef4ef1a05b25fa39ff942f4a95e0ae4750': Refine fix I53e91db7 to apply only to wifi network