Merge "Don't start clatd if disabled by vendor property."