Do not use Fingerprint methods that will change in 1.0

Change-Id: If590929817374c158df1c88afd60e3cde0ea90cd
Merge "Do not use Fingerprint methods that will change in 1.0"