Revert "Merge cherrypicks of [3084543, 3084544, 3084545, 3084546, 3084547, 3084548, 3084549, 3084550] into oc-dr3-release"

This reverts commit 814cdedb5db4d3ffddc417511edc112e531dd3b7.

Change-Id: I26dac1febd557a8e9fd7d7b1a53a34f65fc1ed0c
(cherry picked from commit 68f5223fc656bd0c715f3705031c296df2c71bac)
11 files changed