Merge "neverallow coredomain from writing vendor properties" into pi-dev