Merge "[NS03] Mix in other CS-managed properties" into sc-dev
tree: 773a61189822f368680cb4e36f3e2d59cbf8ee28
  1. framework/
  2. service/
  3. services/
  4. tests/
  5. OWNERS