Merge "Use long to store pointers in ConsumerIrService"