Merge "Updated haptic effect for success" into pi-dev am: d6dbebf7ba
am: f015c6d04c

Change-Id: I9a33d58b2b9d9af17e9aa3082cf7ab63b7e5d0d5