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

Change-Id: I10b10af2f7caac3bfd2ec9b28335fdf4a1647b2c