Merge "Update and cleanup FingerprintManager API to new spec" into mnc-dev