Merge "Vibrator service -> .bp"