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

Change-Id: I39bf388c5470e318876eff9097b7155ec3568b56