This reverts commit f30380ac. Reason for revert: Reverting to investigate the breakage with JDK 9 Change-Id: Ic27ab0ce7c99d809468735d56084114112db524c