Merge "drm vts 1.1 refactor"
am: 8aa8655f24

Change-Id: Icd678ddc89164dc76665ee5af4958cbf14294c34