Merge cherrypicks of [2564715, 2564707, 2564717, 2564718, 2564719, 2564721, 2564722] into oc-dr1-release

Change-Id: Idb4ff5db63abf5d4dcac1156dd0258110d36833b