Merge "Serializable classes should have serialVersionUID"