Add support for dropping capabilities from the bounding set.
am: f9fcdbe673

* commit 'f9fcdbe67360c30a41b70c2f1271c0767eb073c9':
  Add support for dropping capabilities from the bounding set.