Merge cherrypicks of [3026769, 3026770, 3026771, 3026772, 3026773, 3026774, 3026789] into oc-dr1-release

Change-Id: I3ce2a98c60f84890840b823a28fea77a98f8935d