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

* commit '2fa859101f9d5f568c2562b064e233b14973e6fc':
  config_mbr: Fix integer overflow