Snap for 4384531 from f8dc03228fa91479da54514cda7965d5fe6276bb to oc-m2-release

Change-Id: If15f6e1c69c40a9e9a6e2ac82b57e6eeddb4c573