Snap for 4657601 from cb6126c1a1a783e831b8e8e1ee49a2d819de97dc to oc-m4-release

Change-Id: I119ca4b968a2e2d1e22cb0a1ddf8cba08d09207a