@a-robinson
a-robinson Merge pull request #19000 from a-robinson/cherrypick_18997 
cherrypick-1.1: engine: Make temp directory cleanup resilient to rename errors
Latest commit 8b86503 Oct 4, 2017