Merge "Make vibrator test consistent with HAL definition" into oc-dev