Merge "Converted Biometric tests to Robolectric tests" into udc-dev