Merge 17067 from trunk.