cherry pick 97e1f79ad54f5a086674fada55216