Merge "Improved vibration feedback completely" into nyc-mr1-dev am: c9682ab5b5
am: d7eb8794da

Change-Id: Iddd343b7c43f711387f461e98af1a346b744f84b