am 62edc960: Merge change 6383 into donut

Merge commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44'

* commit '62edc960224fd6410d5e08cbb0e09ee4ac6e0c44':
  Cleanup connection when airplane mode is entered.