Merge "Add provideAssistData attr to public.xml" into klp-dev