Merge "neverallow coredomain from writing vendor properties"