Merge "Rename keep.xml in spam."
am: 30ab0e91d4

Change-Id: Ice07cdbd65c5bf81527d9d558ff7254f0e9b262c