Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE