am 7f07068d: am 8d97651d: am 13c9828f: am c40d6799: Merge "Indicating fingerprint error messages on the bouncer now" into mnc-dr-dev

* commit '7f07068df990e88e993e44d58d5c5d4acfbc7171':
  Indicating fingerprint error messages on the bouncer now