Merge "Captive check for both mobile and wifi" into jb-mr1-dev