Merge "Deprecate producer/consumer usage: Step 3" into oc-dev
am: 944be994f8

Change-Id: I63b35ceb9fe4adaaf1bdbc52eb14d003182346bf