Merge R4_7_Maintenance for Java9


Change-Id: I93feda21eb29db31eee086d317c17706aca3fdd0