Merge cherrypicks of [2504334, 2504429, 2504277, 2504391, 2505083, 2505102, 2505048, 2505084] into oc-dr1-release

Change-Id: If953fa9f52fccc40e90c7f667873b11260d54152