Merge change 20536

* changes:
  add support for RGBX_8888