Snap for 4657601 from 6a349a85614e19f57cfaaf12e2dabf376415d86a to oc-m4-release

Change-Id: Icd87cde1ed33a1f0586b62ca14cc4c4465548e08