Merge "Added haptic feedback for longpressing." into oc-dr1-dev am: 8a3ccb11a0
am: 8093e387e4

Change-Id: I096f4415b2a5d9afe36aba9dff1ccffcba9d3158