Merge "Revert "Remove Java 8 requirement.""