Merge cherrypicks of [3026753, 3026754, 3026755, 3026756, 3026758, 3026550, 3026551] into oc-dr3-release

Change-Id: Ibacb686732a925b7fd5325f7b2b7bc940a056f7b