B-55868  changes to fix test flakiness
Merge pull request #672 from kushala2012/master

B-55868  changes to fix test flakiness