Merge "Make TimeZoneDistroInstaller non-final for mocking"