Merge cherrypicks of [2570269, 2570223, 2570226, 2570230, 2569311, 2570355, 2569933, 2570395, 2570325, 2570360, 2570396] into oc-dr1-release

Change-Id: I01f0183a66bfbb21fafff6e0771f9e066d9cc155