Merge "Add search key for fingerprint"