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

Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2