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

Change-Id: I1d52904d9d74e91808ee4021acaabf2f0cdee295