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

Change-Id: I326ea761cfbb02d9f96b04c8cf51070d38673c8a