Merge \"Changed to vibrate on down instead of up when entering pin\" into nyc-mr1-dev
am: 798d69817d

Change-Id: Ic940aa6733ddf9e7415f9ae43b849ae2c2c06cd0