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

Change-Id: Iff715e0a4203bf19563b95ac2b8b57f0bb43504d