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

* commit '15ff8af7a7cec3c55dde81419b0522fc4adcbeb1':
  instrument fingerprint settings