Merge "Add a null a check in fingerprint service" into pi-dev