Merge branch 'stable-3.3'

* stable-3.3:
  Plugin reports wrong number of failures

Change-Id: I871847a6856ee85a63aba801fcd1788ab8209696