Snap for 4386615 from 0a3a7d79082765c3805f154c1bd67b8e7d4527ea to oc-m2-release

Change-Id: Ib13cbce72bf5849b0c521fab23962ec9f5449293