Merge "Add serialVersionUID to Serializable"