Merge "Support reevaluation request from captive portal app" am: 254c3d830e am: 006e9bc1e7

Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2