Snap for 4373604 from fecb03d289ac347852ce63b8b37677066ab6746f to oc-mr1-release

Change-Id: I173b8ec4317f929ad447a062be3387ce5d98fe44