Merge "Fix captive portal can't show certificate problem" am: 1bbb08b87f
am: 060b94c618

Change-Id: I64b05adcb46baf3fca116dbdc5177bc31c71e06d