Merge "DO NOT MERGE Instrument captive portal login activity" am: 778ade9073  -s ours am: 5da98a422d  -s ours am: e3efe5d054  -s ours
am: 8dbe9aadc1  -s ours

Change-Id: I6356cdc775fa4fe6f98fff1e5720a9470df00f94