Merge "Migrate PM Mapper Build to Java 11"