Cherry Pick 4d23dc12647a57efeaa4d2f94c75c0bfa2335560