Merge "Fingerprint virtual HAL checkin (part 2)"