Merge "Fixed NPE in FingerprintAuthClient" into sc-qpr1-dev