Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"