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

Change-Id: I187e0a1b018678de79a93f2cd02d518b0fcedcfb