Merge "Isolate sdk sandbox data"