Merge "Fix codegen ArrayMap fields"