am 4d87d91d: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev

* commit '4d87d91dfe886713df96abd3c0d1c9e20cf385e5':
  If in a mobile captive portal is detected enable fail fast.