Snap for 4657601 from cb1a2b98f2dfef30e2e987698321d84cf49d7b17 to oc-m4-release

Change-Id: I9434fc9025d264d1bee3d0cf1a3b80ff7e9b3d90