Add support for new KK ConsumerIR

Change-Id: Ic08fcebaa4b7f3ebb149126769e03e75021e3314
Merge branch 'cm' into HEAD