Merge "Improving the haptic notification experience" into oc-mr1-dev am: 00c988a188
am: 198d861794

Change-Id: I74237ee705391c5a570b52cc75718ef2f97572b0