Merge "Update ConsumerIrService to match revised IR HAL"