Pull in changes to fix CA-136275.