Merge cherrypicks of [3052245, 3052625, 3052568] into oc-r4-release

Change-Id: I8209790dae3470dd923d29bee069e1e367679f48