Merge "Include the timestamp in the data returned by the Spam interface."