Merge "[NS03] Mix in other CS-managed properties"
tree: b8131e5c7a8d8bc126ab000860c93daecbb13563
  1. framework/
  2. service/
  3. OWNERS