am 463444fb: am 420f2688: Merge "Only listen for fingerprint if needed." into mnc-dev

* commit '463444fb231ed724ec915ce9f99de5ef94c53e05':
  Only listen for fingerprint if needed.