Merge "Remove the 'Factory' time zone by not processing the 'factory' file."