Merge "drm vts 1.2 refactor" am: 568b391009

Change-Id: I8aca7873679cf278e4adc9345f1056c03ea2e935