Note that the large whitespace diff on the appup file is because this is the first time the new script for modifying appup files is used.