Merge cherrypicks of [3026519, 3026520, 3026521, 3026522] into oc-r4-release

Change-Id: Iaafc7286b10f54375d288560b4dd518b1fc629cb