Merge "Add dummy serialVersionUID in SmallResource to prevent Eclipse warning"