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