Merge "Remove the declaration from manifests (1/n)"