Merge "Fail upgrades that change storage devices." into nyc-dev