Merge "Make BiometricsViewModelFactory Java 8 compilable"