Merge "Stop using CaptivePortalData in the shim interfaces."