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

Change-Id: If5f478450cb987145e99635ce2e806974e317b48