am 68668488: am 40578b6a: am a749ea4b: am 11cf92aa: am 1dca55fd: skip the merge of 67e7c661 to lmp-mr1-ub-dev

* commit '68668488cb32682b5f2f199e2bdf1b02eafcf7c9':
  Add support for clobbered blocks