Merge "Remove skips for bug 1182384"