Merge "drm vts 1.1 refactor" am: 8aa8655f24 am: bdfb1cc257 am: d5a9aed754

Change-Id: I5debd1bb1611342f37411b1aea27bf034d79c80f