am 6c0fcc96: am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev

* commit '6c0fcc961e1650113947918dc105c2a459ebf40d':
  Captive check for both mobile and wifi
tree: c87418ddc4c5370b3b744110f569d4b208310253
  1. core/
  2. services/