Merge "Track removal of tz data files from runtime module"