Merge "Use CS identity to update setting while performing factory reset" into sc-dev
tree: a63ec0ee2feaa1138c2e83a1f3ec27b2e90800ba
  1. framework/
  2. service/
  3. tests/
  4. OWNERS
  5. TEST_MAPPING