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

Change-Id: I06da8ea7b065e06f213ae456c4197eee2b2ea367