Snap for 4657601 from 1fc4509e0726bc266407c98e260876e29bf2cd89 to oc-m4-release

Change-Id: Ide42c90860123128adbcdb5795356f5a72d4f618