Merge "Remove no-op parameter from UIDGeneratorTest"