Bug 1043293 - Follow up with test changes to address failures
Merge pull request #22554 from viorelaioia/bug_1043293

Bug 1043293 - Follow up with test changes to address failures