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

* commit '6ac9046d84ea736cf7e96da4da6e92dbd1fc624a':
  Update fingerprint settings to spec