Merge cherrypicks of [3026525, 3026526, 3026527, 3026528] into oc-r5-release

Change-Id: If5482d78e845fd326b171b1b0c4a6515efc55a85