Merge "Add metrics logging for critical fingerprintd errors" into nyc-mr1-dev