Merge "Remove unused copy of TimeZoneDistroInstaller"