Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair