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

* commit 'e932cf23a8e587c32b100e72bc8c9a1c4bb835b7':
  instrument fingerprint settings