Add cherry pick section + fix build Java 7