Merge "Make consumer_ir an optional service." into cw-f-dev