am 36838993: Merge "Fix configured network status"

* commit '36838993dfb67a2056468ab74a77a81afa053c9c':
  Fix configured network status