Merge "remount: Ensure that scratch images are block-size aligned."