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

Change-Id: Icc32e12cf59933c3ab64e1aa97f54739eaef66d1