Merge "mako: adjust vibrator amplitude" into jb-mr1-dev