Merge commit '137e071ca42f2c9e378d974c399a89504804a1e5' into vulkancts

Change-Id: I40ccde0cd8e6d1f080253225e22afdc3a358a1e7