Merge "Create and support isolation for /data/storage_area" into main