Merge "Fix CTS : BitmapRGBAF16Test#testSetPixel failure" into oc-dr1-dev