Merge "Fixed NPE in FingerprintAuthClient" into sc-dev