Merge "Revert "[pm] remove old stage dirs on low storage""