Snap for 4381952 from 344b53b53f0fd856a4740dcec61bcb51f501cc3b to oc-r6-release

Change-Id: I6a889f2bb2995ec3c9f9298d88c87a3b35160c55