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

Change-Id: I76875057e9f8bdb3bac85e6b89e5652a59308e37