Snap for 4448085 from 6072e690e254968c85465a669a2e2cd27bd9804b to oc-m3-release

Change-Id: Iea8f81f901117e40319077c24cdefd93a4ed8d49