Snap for 4657601 from 528b92885bb109059b748056a26be9772814e012 to oc-m4-release

Change-Id: Ic95be447e02b3e3dab1f5792671cd0141e69395f