Merge "Rewire config for time zone detection services"