am e8d8af2b: Merge "Update fingerprint settings to spec" into mnc-dev

* commit 'e8d8af2b464df3815d1a02c370cf44a80cafd8e3':
  Update fingerprint settings to spec