Merge "[NS04.8] Address comments from NS04 and NS04.5" into sc-dev
tree: 018e9ccdc3841e32d97af0e73a86c3ed1bbdd0f6
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING