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

* commit '350926ef2f13f75335b32e9904dc0b46c01ab1fe':
  Fingerprint: Use integral types for remove()