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

Change-Id: I0a78d2874f04500c17896bbb8e1a7698af6f94a3