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

* commit 'a82dc281b291378b6ff52192dc4c006fe743aaab':
  Add support for clobbered blocks