am d0f3b4f6: am 1a833d24: Merge "Add support for clobbered blocks" into mnc-dev

* commit 'd0f3b4f6b4ce2c2e3c8833f50212003d5f5b88bb':
  Add support for clobbered blocks