Merge \\"Update resource string for gestures settings.\\" into nyc-mr1-dev am: 4410b6b663
am: 0a86720e19

Change-Id: I790175513041954dad3583ca1f1d40566e617ebc