Cherrypick 64826