Merge \\"Reduce vibration length of camera gesture\\" into nyc-mr1-dev am: d37db3c77f
am: 843d16715b

Change-Id: Ie40fe8ce2469bdf24a77f6106cd9e94c87887b14