Snap for 4373604 from 8808d37f3b9037328cdd045e222b0b741ab5b840 to oc-mr1-release

Change-Id: Ia5bc2a6cf8d16c35c74879c022418e30951b071b