Merge "Merge "Switch to listening for all network changes." am: 085ffa76 am: 46f8abd2 am: 118c0c9e am: 8aba3246"