cherryipick  f3fad78b59