Snap for 4417144 from f2b791587c15ec5028d0b266d415c631a4078916 to oc-m2-release

Change-Id: I6f114a47469ab69f46bf9d9b7c1429294bb80ec2