am 665c912a: Merge "Listen for network disconnect." into jb-mr2-dev am: 7a8f0658c6

Original change: undetermined

Change-Id: I429a400cfff8b6ed51db23b1cf72cdd4856903dc