Merge "Don't remove existing explicitly stashed blocks"