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

Change-Id: I40d65d02230ec2e10e12b86801e16ae4d41e4ba6