am 7788547f: am 586b38cc: Merge "Calculate max_stashed_blocks correctly for block OTA v3"

* commit '7788547ff34d93b5196933eedb9f006fb1fe9f4d':
  Calculate max_stashed_blocks correctly for block OTA v3