Merge changes I4a2e97a0,I11248f6b

* changes:
  Ensure subdirectories of sdk data inherit group id of parent
  Destroy SdkSandbox User Data