Merge "misc drm@1.2 vts fixes"
am: 1d85278536

Change-Id: If954db85d1d5b6e8eddbf0b18c382c31ea618ad6