Merge "Integrate upstream changes from 8u121-b13 in URLClassLoader"