Merge cherrypicks of [2182268, 2182286, 2182190, 2182287, 2152102] into oc-dr1-release

Change-Id: I9b072a8ae407cced868a4aa673538ba4f7c5baf7