Merge "Fix failing drm 1.0 vts tests"
am: 9367cc5918

Change-Id: I970d19127c44e5e84108153fbed170fed11eed5c