Merge "drm vts 1.0 refactor" am: ae3a851727 am: aba5f2f610

Change-Id: I107bb0e93df7f66c9adcb24e4ef7fa87fb9d7745