Merge "Fix compatibility issues with Java 1.8 Map"