Merge cherrypicks of [2572742, 2572743, 2572745, 2572746, 2572747, 2572748, 2572749, 2572750, 2572751] into oc-dr1-release

Change-Id: I1a8d5334b23c7ad26a1c1cc4929df0d5fcba4d7d