Merge "Instrument captive portal login activity" into oc-dr1-dev