Upstreamed by Commits ID
57280728e277c66d7803592cf071d87a21654d09
fd5996f2d060a090c0d4bb0107a8790221539eb9
5588ebe78620e7ee99bc56a08e964499af52a63b