Merge cherrypicks of [3131626, 3131642, 3132434, 3132437, 3132440, 3132443, 3132445, 3132448, 3132494, 3132495, 3132496, 3132498, 3132500, 3132034] into oc-dr3-release

Change-Id: I037c5a60378cbdb9cde6cccbf0370dea873d0c15