Merge "Remove extra comma in knownfailures.json" am: 51e5474b7b am: 6174153c6b
am: b4f05983c6

Change-Id: Ic31108696e9729a0a035e4519b33b8a679670fb6