Merge cherrypicks of [3026511, 3026512, 3026513, 3026514] into oc-release

Change-Id: I0bca7b9738dc54a3a09284e8e99bcccebfcf0505