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

Change-Id: I7bec3b671cf681e74c11b589cef690ad6861eb9a