Merge \"Avoid runtime restart when storage is missing.\" into nyc-dev
am: 18553f5f73

Change-Id: I9303aa177f25f27db7090bf2464218d690aaeafe