Merge "Make uid marking rule's API consistent"