Merge "Support reevaluation request from captive portal app" am: 2d9623d86f am: 8f50df2e87

Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2