Merge "updater: Drop the 'blocks' parameter in LoadStash()."