Merge "Fix spelling mistakes in attrs_manifest.xml"