am a18e6ffe: am 8b98ef6f: am 15ff8af7: Merge "instrument fingerprint settings" into mnc-dr-dev

* commit 'a18e6ffe9a3c53daa57d622965f594b56dd559a5':
  instrument fingerprint settings