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

Change-Id: I153139e241dc721a20780113a357ab6b40b17502