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

Change-Id: I7020f863eb4e665a9d457c1608fa8d4c6201e039