Merge cherrypicks of [3783728, 3783729] into oc-m4-release

Change-Id: I9e1c316fea8f2bdf18fb8ad0bb38f5c4d6485fe7