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

Change-Id: I3402c0cb46110c710c19a82af1cba044419df20e