Merge "Fixing the HDR conversion aidls" into udc-dev