Update with pending CL for the JVM options backout