Bug 535583 - Adding a Java 11 JRE can lead to NPE Change-Id: I0dfb22b318e62ca7219b2b23265ccbc37a400a4b