Merge trunk version 194076 into gupc branch.