am d8f61f20: (-s ours) am 74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev

* commit 'd8f61f201dfc0fe669d45ee2f0d540de3771b984':