Merge changes from topic "rm-vibrator-1.4-pass-2" am: 8fee0722bd
am: ee46efcad7

Change-Id: Ief89e8846c9a20411b0c7ad9e1a81ed4da1c8fd3