Merge "consumerir.default: remove unneeded dependency." am: cf1ee150ee
am: 8f1643eadf

Change-Id: I801c790560c5ec10aebe427d05292949e1e7612b