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

Change-Id: I7e3009b6e54a8f443214b68d4f64470475a4acd5