am 4e84f34f: am 350926ef: Merge "Fingerprint: Use integral types for remove()" into mnc-dev

* commit '4e84f34f12ac78158cfcb888c932d33f764233e3':
  Fingerprint: Use integral types for remove()