revert the clean droplet
Merge branch 'x-plat_dev' into store_container_local
Merge branch 'store_container_local' into x-plat_dev