Merge cherrypicks of [2576473, 2576525, 2576526, 2576576, 2576511, 2576533, 2576512, 2576578, 2576534, 2576595, 2576513, 2576596] into oc-dr1-release

Change-Id: Icd66319d7245d3f3ce4074c1e850a66d6a36b6fb