Merge "Fix captive portal can't show certificate problem" am: 1bbb08b8 am: 060b94c6 am: c0274d13 am: d675290d Change-Id: I2656bb709cb0bf259279ca75ad8411cd8c92fb43