Merge "Show broken lock image when SSL errors are encountered in...
Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev
automerge: ee8feae5
* commit 'ee8feae5':
Show broken lock image when SSL errors are encountered in CaptivePortalLogin.