Merge "Revert fix for FingerprintManager leak" into oc-dev