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

Original change: undetermined

Change-Id: I3418d2536960a988faad20894a9c8d5be133f83d