am 41bec8e5: am 803e8d85: am e287d24e: Merge "Allow overlap in UidMarkMap" into klp-dev

* commit '41bec8e5b517c189df908193c4cb6b5b0abdb709':
  Allow overlap in UidMarkMap