Merge "Add greyscale intrinsic test." into jb-mr1-dev