Pull fix for CA-121295 into trunk-ring3.