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

Change-Id: I6c4f4f993c015a6e77671706bded956590a4d048