Merge "Deprecate producer/consumer usage: Step 2" into oc-dev am: 6f413c5f54
am: 35c170928c

Change-Id: I85ceca5ecef5097a304d8ecf5dc27d68b78277e5