am 9561e63f: am 909c7586: Merge "Fix Security2Test counting"

* commit '9561e63f432b3183a86cfb7442fc935950dd2b98':
  Fix Security2Test counting