Merge "remove public.xml from google3"