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