Snap for 4384531 from 02fc806bbb3ce8d96049ed83a55d5969e1c506a1 to oc-m2-release

Change-Id: I6aec64a760b8db62c719e8912005ca594b25cfed