am 67cf4bad: Merge "Don\'t break things if a network goes back to CONNECTED." into lmp-preview-dev am: fe485fcd53

Original change: undetermined

Change-Id: I4fddab207a1c4b5ea2741d5144043f791e64b80a