Merge "Remove duplicate declaration"