am 909c7586: Merge "Fix Security2Test counting"

* commit '909c75864cee351044d5be6dcb21d8e01eded92e':
  Fix Security2Test counting