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

* commit 'd267c3b3212f804a1507947f98233230af9413b4':
  instrument fingerprint crypto token service