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

Change-Id: Ic8c08b363a1069e8eadf714fa59023b6b1c0c643