Merge cherrypicks of [2578939, 2578955, 2578902] into oc-dr1-release

Change-Id: I8b84fc6c8c6c0a012c926867b4c39d6f6480e833