cherrypick upstream 63303