Merge "Add and use ServiceProvider interface on fingerprint2.1"