* Also update haptic feedback logic Change-Id: I722022d014d9e88ef267a5563b43fee87ef02b6b
Change-Id: I22a7ee5b7eec5667b14f1a587a6d0138e77dc0f3