Snap for 4657601 from ec958fd4ee7a60bae0f980a78a146402316b0b9f to oc-m4-release

Change-Id: I17d8ed69e471c2cbf6d1a38d2200643ea96e500a