Merge "Fix block partition size in fill_mode_info_sb"