Merge "New haptic feedback constants" into oc-mr1-dev am: f3b78305ff
am: b737076a4e

Change-Id: I94a90ce699c420f6f761f55c31967ea407e1e8c5