Merge "Fix errors in UIDGeneratorTest::testTimestampedUID"