Merge "Failing uchar4->int4 test" into jb-mr1-dev