Merge changes Ife5e91de,I46c5dfeb

* changes:
  Change the sanitizeCaps signature in preparation for moving
  Clarify sanitization of caps from NetworkAgent