Merge "Fix issue with double vibration trigger" into oc-dr1-dev
am: f34b4633bd

Change-Id: Iaa872f5a6990f01dd832f48c88a3fc4625a89063