Merge commit 'd44e43d424df67fb1f621a2569fb32f83275557f' into video-userspace.lnx.4.2.r3-rel

Change-Id: If7266694c9d00320b88d275ce54119cf21cf8b55