Merge "Use filter from CollectionUtils." into sc-dev
tree: f9a6f9669acffe8463306de15149ec0c7bfb2ec7
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING