am b2a32cb9: am 8fb0caa7: Merge "config_mbr: Fix integer overflow"

* commit 'b2a32cb99099b705578f40d1ba509bd48db140af':
  config_mbr: Fix integer overflow