Merge "DRM vts test bug fixes" into oc-dev
am: ca7205fa61

Change-Id: I873889b274818b27064f32467828ac18c14c9c92