Merge "Fix missing comma in knownfailures.json" am: b84c43f056
am: d0224a478a

Change-Id: I59f5014740082646dfedbf28d695a577de3cab9c