Merge cherrypicks of [3026515, 3026516, 3026517, 3026518] into oc-r3-release

Change-Id: Ia4fe25e8e0223d11b2f9b8dcb3916c85f6e1e19e