Snap for 4657601 from e938642cb5713fd39b554c889830670ea4970ee9 to oc-m4-release

Change-Id: I08c7490e7bfd81ba0833c5f39214de470caa31f8