The fix to this issue is two-fold - one in hotspot tree and the other in jdk tree. Changes to hotspot were checked in http://hg.openjdk.java.net/hsx/hotspot-rt/hotspot/rev/815957d0203e. Changes to the jdk8/tl tree can only be done once the hotspot changes make it to the jdk8/tl/hotspot tree. So, this is a sub-task representing the changes to be pushed to jdk/tl/jdk repo.