Merge fixes for custom vibration

Change-Id: I56aa3389aaf9c233777ea2530fec12dc37159749