Merge "Update ServiceWiring to use ContentLanguage"