Merge "Fix a UidMap crash." into pi-dev