Merge "consumerir.default: remove unneeded dependency." into oc-dev am: 64e609dda8
am: 9e610d1a3b

Change-Id: I92c961d3fee7de44b261e379b36147126f3b8392