Last cherry-picked git revision:
274e1fe5210b379fbfdca9a565715d2db1df2d04
