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

Change-Id: I424ebdb6a6cb0d7549ca0a9658c1c59d099addc1