Merge "Remove surface from fingerprint methods"