Merge "cm: remove tmp file on boot" into gingerbread