Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev