Fix S3 system vm start issues caused by recent storage refactor work.