Merge "Add verification of knownfailures in the testrunner" am: 76c84ce90e
am: d439be76ec

Change-Id: I7e43ddb614385d3cd6228e6b33509676558c836d