Snap for 4373604 from 9e1bd9758aec4d177cd1410bb852f299eb06cbc1 to oc-mr1-release

Change-Id: Ibc88851e4766ffb66b5ac1923b3ea44053065912