Merge "Unify configs that prevent select services from being run on watches"