Merge "Dedupe timestamp in PackageSettings" into gingerbread