Merge "Add extra flags to biometrics proto for tests." into sc-dev