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

Change-Id: I96f82f041b28fd6eede36c6126c66286f8f4f1e3