Merge "FingerprintService: check current user correctly" into oc-dev am: 23a7c1e870
am: 54b6116457

Change-Id: Ica03cfdb53899ef3a4c36908038581761c0641f0