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

Change-Id: I3671012533b8e1c138bbe75557116a17bf9d4762