Merge "Remove skipped test for bug 1061738"