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

Change-Id: I7640d2eec7e2d660a99ac617381259ad8379c340