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

Change-Id: If81ae49da0f094dbf97421a3a921c654ce0c81eb