Merge "Fix UidMap CTS" into pi-dev