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

Change-Id: Id0c020ade4c7de71f7540a82d84045e131ea25e2
tree: 0b68d4aea11af23e293046cbf4c179d87f4657ae
  1. core/
  2. services/
  3. tests/