am fef7556f: am 3238cc2a: am 32f89821: Merge change 26044 into donut-gms

Merge commit 'fef7556f058d0d17b30180c03387558bc59d3105'

* commit 'fef7556f058d0d17b30180c03387558bc59d3105':
  Remove tests.api.java.io.FileTest#test_delete as known failure.