Merge "Migrate to jdk11"