Cherrypick 04685