Merge "consumerir.default: remove unneeded dependency." am: cf1ee150ee am: 8f1643eadf
am: 6098fd8d0a  -s ours

Change-Id: I6f0f1fd6878b4c3ba2116cfb3f6fc9719601266e