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

* commit 'e287d24e9cfd6ed84bdb69a82b6f8357de2fee34':
  Allow overlap in UidMarkMap