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

* commit '1a833d24c466f4bf765d0f00d02dded9aad0477b':
  Add support for clobbered blocks