Merge "Switch to listening for all network changes." am: 085ffa76fa
am: 46f8abd229

Change-Id: I28ad47a86ea534c5b675a530ffbaac415fd60b25