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

Change-Id: Iabf8f8b72cd059d3c2f8b8f0767e65e1fed09a13