Merge "[automerger skipped] Merge "Fix captive portal can't show certificate problem" into qt-dev am: 709c46a6 -s ours am: 83a528fb -s ours
am: 96f935de -s ours
am skip reason: change_id I64b05adcb46baf3fca116dbdc5177bc31c71e06d with SHA1 c0274d13 is in history

Change-Id: I3962e86a90d2aab12c46bded7c676e4ab975749e