Snap for 4402310 from 7cc69062a2c972593bf30f31bde87373485578f3 to oc-m2-release

Change-Id: Idba10bbb690a353909b363bbf550e2cdc9c75d23