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

Change-Id: I31b65a3ca79f269f66b4f7b623d7acac4265af0b