am 4157cb24: am 02eab434: am 3f58ba89: Merge "If in a mobile captive portal is detected enable fail fast." into jb-mr2-dev am: 78f8907ae1

Original change: undetermined

Change-Id: I9d3a8e70a6d7259e71125298a5fd0bba0b7ee9e6