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

Change-Id: Ic2ab5a53be77107285b8976867cfe2ec8762be4b