Merge "Add verification of knownfailures in the testrunner" am: 14f01c28d7 am: 6e85ed8009
am: af909ffcc9

Change-Id: I46f1f6d128b19cb1e3ef91b52f7088da43474b8f