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

* commit '8fb0caa73b947ec801a5ae975f46560fb813baed':
  config_mbr: Fix integer overflow