Merge "Fix fingerprint API for 3rd party apps"