Merge 17130 from trunk.