Merge "VtsHalDrmV1_0Target test failure" into oc-dev