am f56ae2b9: am 118cb035: Merge "Filter roots based on incoming request." into klp-dev

* commit 'f56ae2b903a24a891cf349025c97c05134e88e59':
  Filter roots based on incoming request.