Merge "[NS03] Mix in other CS-managed properties" into sc-dev
tree: 83c62ed4a4ff80ac96abd013902797c4c248ae47
  1. framework/
  2. service/
  3. OWNERS