Merge trunk version 195330 into gupc branch.