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

* commit '412a5c3f52dafcb21fb86d6ca6bb5fd3deed90a4':
  Add support for clobbered blocks