Merge "Removing extra haptic feedback. am: 7660bca509 am: db7ef9378a am: 4b592938c8"