Upstreamed by Commit: 5588ebe78620e7ee99bc56a08e964499af52a63b