Merge "Amend drm@1.2 vts mock errors"