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

Change-Id: I39e5302384530e81675560f81a8c41ee7325bbc3