Merge "Revert "Deprecate producer/consumer usage: Step 3"" into oc-dev am: cffef95674
am: 27200c9949

Change-Id: I40f7ea97c4cfa7b491a9fc9d99c6cdee238ea9e6