Merge "Add new method to FakeUid"