Snap for 4399693 from 36c513d8d56c12b56853ee69ebe988daf04f8ee7 to oc-mr1-release

Change-Id: I3aae0b2b388c4ccc9c2ea9d5b7f342677116bf93