am 95e3cba1: Merge "Reconnect/teardown proxy network connectivity." into klp-modular-dev

* commit '95e3cba1f66af5594b5bdc210426ced44dd7b7ac':
  Reconnect/teardown proxy network connectivity.