am f40a34fd: Merge "Retry adjusting the size computation for reserved blocks."

* commit 'f40a34fd23e737b14067308700b3eef27e42d3b1':
  Retry adjusting the size computation for reserved blocks.