Merge "drm vts 1.0 refactor"
am: ae3a851727

Change-Id: I6216e690fb74bfcf0cc02dbed2093b6a33677c88