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

* commit '803e8d85f3b78f06288d4651cd814f3f05fdcebe':
  Allow overlap in UidMarkMap