Snap for 4448085 from c488c7e1dc88194c546c436eda6f7f24dc1b08be to oc-m3-release

Change-Id: Idf20374454a0f204ca83cdf5991a6558294d584e