Merge "AOD: Show fingerprint error messages"