Merge "Fix test flakiness due to InstanceIdSequence" into main