Merge "Remove Some Broken Paint Tests" into gingerbread