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

Change-Id: I90b55d9a62e240eb54f107302dc55bea2b730db6