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

Change-Id: I3a4be4ed2d7644805cfe32374c503bd16887bc97