Merge \\"Default fingerprint swipe to disabled.\\" into nyc-mr1-dev am: 781f4386dc
am: f7f4dfea71

Change-Id: Icd36956bddc4406551cdf2d8ebb626b3bfb6c6de