Merge "Add a regression test for bug 118835133"