Merge "Remove Type X Tags from the top-level API." into gingerbread