Merge R4_7_maintenance for Java9 


Change-Id: I48fb21fe5f390df028256690048dfb7335770219