Cherrypick 2972