Merge cherrypicks of [2445838, 2447382, 2447022] into oc-release

Change-Id: I99c60c8c22735c38d4f69be7da76bf1ea20e0f27