Merge cherrypicks of [2984450] into oc-dr1-release

Change-Id: Ic6c554d51098d23d8511edeb62e55ca87eee96d3