Merge cherrypicks of [3026759, 3026760, 3026761, 3026762] into oc-r2-release

Change-Id: I6c5e29e786990451bdac2080b66ac64c171d69ab