Merge "Retire map_flags in map_buffer"