Merge cherrypicks of [2747421, 2747423, 2747425, 2747426, 2747427, 2747428, 2747429, 2747430, 2746683, 2746684, 2746685, 2747431, 2747432, 2747433, 2747434, 2747291, 2747435, 2743617] into oc-dr1-release

Change-Id: I38cce713d451122bb65d2c0572ffd5d7c2e7adb9