am c1ff2c73: am 422f04bc: Merge "Speed up network transition when WiFi disconnects" into mnc-dev

* commit 'c1ff2c730d24514f5097144cd14a7b48df05ec39':
  Speed up network transition when WiFi disconnects