Merge "Enable cleartext for captive portal apps" into pi-dev am: c88ca67bb3
am: 617f6159db

Change-Id: I742bf6be74a9e6953d0a779bdab0c25cf32aa740