Merge cherrypicks of [2733460, 2733193, 2733197, 2733198, 2733401, 2733480, 2733481, 2733482, 2733402, 2733483, 2733403, 2733484, 2733485] into oc-dr1-release

Change-Id: I06cb3e6490b0a214c141fc603ecea9ed479553e1