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

Change-Id: I496e6162949d0e12093e09f690d19a10e7132351