Merge commit '0070ee42201c3d1c005828234ece3e25e620dcc9' * commit '0070ee42201c3d1c005828234ece3e25e620dcc9': Refine fix I53e91db7 to apply only to wifi network
Merge commit '0070ee42201c3d1c005828234ece3e25e620dcc9' * commit '0070ee42201c3d1c005828234ece3e25e620dcc9': Refine fix I53e91db7 to apply only to wifi network