Merge "Clear fingerprint stats after dump --proto" into pi-dev