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

Change-Id: I0784fd084dc7767f511b60ee95b702ebd8e063a0