MFC r337329: Fix the regression test for PR 181741.
MFC r337424: Update PR 131876 regression tests after r337423.
PR: 131876