Merge "Support reevaluation request from captive portal app" am: ba43c13e77 am: 92718acb09

Change-Id: Ie186aeac83cf30478ba0fedc0686b5e506e1add2