remove foo.diff!
remove foo.diff!

Change-Id: I2f6abf4f673f5f514113d931551d66c86b8a7e8d
(cherry picked from commit ecdaf35d4ad27fd4b207799289909ae25eed6f89)

intelxed/xed,intelxed/xed,intelxed/xed,intelxed/xed