Merge cherrypicks of [2837169, 2837170, 2837226, 2837188, 2836859] into oc-dr2-release

Change-Id: I2348622921fc64c00f7afb47a409ab3d2dac3656