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

Change-Id: Iaeba5df409ef3d0dde39b7f4406955e4ba8626ff