Merge "Add start / stop to location_time_zone_manager"