Snap for 4384531 from a948e7b439983f9feda3ed5f4b22d4f5a89c0f6f to oc-m2-release

Change-Id: Ie70488e849d20a51ee1ce3fcc247867c8b9cd460