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

Change-Id: I9c3030d8c32fc4c678a211769dcc3644966d3078