Merge "Fix overridden packages in backuptool" into ics