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

Change-Id: Ie96a5aef1bc953fd41420550baa38415afae0083