am 7102f577: Merge "Adjust the size computation for reserved blocks" into mnc-dev

* commit '7102f57781a8cde2e450951af3cbd7e60b44dca1':
  Adjust the size computation for reserved blocks