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

Change-Id: I9bc11e913ec84acbbe90a255ed95851dc1d953d0