Merge "Remove duplicate declarations"