Merge "Add more tests for CaptivePortalData" am: 0bb146e4 am: 0cae3ac0 am: fa56a9c1 am: 13bef303 am: e8431af6 Change-Id: I5ff3a688b8219380a2c0d9cb1a8dccab34fe1cf8