Merge trunk version 194962 into gupc branch.