Merge "More fingerprint API's for 3rd party apps"