Merge cherrypicks of [2587803, 2587249, 2587250, 2587807, 2587835, 2587837, 2587816] into oc-dr1-release

Change-Id: Ib52c1f5eee5d36c96c58f9d4142f1d6cea256364