Merge "Adjustments to composer apis for HDR:"