Merge "Use CaptivePortalProbeSpec method in portal app" into pi-dev
am: 9a963e1137

Change-Id: Iebd307b5d73a7b4679baea2a1c12c3baba6a7447