Snap for 4448085 from f2b791587c15ec5028d0b266d415c631a4078916 to oc-m3-release

Change-Id: Id0e8bb274f32339b9889c9b0de619e011711c5c7