[automerger skipped] Merge "Fix failing drm 1.0 vts tests" am: 9367cc5918 am: 04f664a094  -s ours
am: dc3fb70617  -s ours

Change-Id: I755e5e89f3e6e2620080095719557798bd1c936f