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

Change-Id: I6c462113f27a5295b6b6c6933272f9045ea38432