Merge "Make consumer_ir an optional service." into cw-f-dev am: e9decbdd57
am: 61ab0a4535

Change-Id: Ic4ca77224e14928e4745238b57c90f48e0f1fb6b