Merge "Mapping of haptic constants updated" into pi-dev
am: 23b69b6fde

Change-Id: Ia7c6db10bee1b43aedc641ddc298113d74c181db