On the javahl-1.8-extensions branch: Cherry-pick the r1606731 bugfix from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/javahl-1.8-extensions@1606747 13f79535-47bb-0310-9956-ffa450edef68