Cherrypick 8269afbaa4e1a