Merge "config_mbr: Fix integer overflow"