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

* commit '8b98ef6fd80c300e327b9f189ac800492f8cb9f5':
  instrument fingerprint settings