Merge "drm vts 1.2 refactor" am: 568b391009 am: 5200f40770 am: 2be492bc6a

Change-Id: Ied460532655545b0d1d56a5a433362be42155c7b