Merge "Add extra OWNER, remove xoogler"