Merge "Fix FingerprintService package comparison" into pi-dev