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

Original change: undetermined

Change-Id: Ib0a87f3a5800aa9e3f47844f22d18ce0228f57f4