Merge "Fix fileslist for system other image"