Merge "Adding new methods to FakeUid."