Merge "Remove extra text from AndroidManifest.xml"