Snap for 4399693 from ab00ba951bf9bc7480bc62ea079d14ce90b37dda to oc-mr1-release

Change-Id: I953d5fc71640aa0af08562249a7cad93394591c0