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