Merge cherrypicks of [2605310, 2605311, 2605356, 2605305, 2605434, 2605435] into oc-dr1-release

Change-Id: I36168cdf3a15af58ab7e27ead5cc754f994b87e1