am 83d83194: Merge "instrument fingerprint crypto token service" into mnc-dr-dev

* commit '83d83194c3e68740593800ee2c295247d2bf2e06':
  instrument fingerprint crypto token service