Merge commit '2898223375d57fb3974f24e1e944bb624f67cb73' into vulkancts

Change-Id: I8ed9672e0a68cfbbd7a4ce8ffca98101cf466c8b