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

Change-Id: I9fe10c243fc615208a6250fed6c9f33c9c54ec02