Snap for 4657601 from 07356ba902eac94cb2d7f8c47656d419801bcb85 to oc-m4-release

Change-Id: I2bc421380640f20635c1837faec6478875cee6c3