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

* commit 'e0346fa7fa715f785ea60966f38a474f337278ca':
  config_mbr: Fix integer overflow