Last cherry-picked git revision:
c32c5c327758a047ae10e55a2465ba54293dfff9
