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

Change-Id: Ibe290e5ef25832b3c132c9406cc8ab238666a816