Merge "Update FakeUid for new methods"