am 2f7ae925: Merge "Add support for clobbered blocks"

* commit '2f7ae925a3fa7f46fbfe6bb22b9b7c5962de49aa':
  Add support for clobbered blocks