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

Change-Id: Ib406f1e3d01c5686031cb60106faafd057b1fb9a