Snap for 4657601 from b2e8c5a20709ff8273236ab76f3a2caa9b83630e to oc-m4-release

Change-Id: Ic38ee6339dd717720126bf9e16c404d37136feaf