Merge "knownfailures: Remove trailing semicolon." am: b2a550b565
am: c58b271c7a

Change-Id: I96d98087708b727a3dd8d626bbb923236167ac03