Merge "Fix failing drm 1.0 vts tests" into pi-dev am: 4c5db7f254
am: 3f8bcef4a9

Change-Id: I789328e51b415527f0985f4da1ab579fdc4f158f