am 0f74afbb: Merge "Remove Type X Tags from the top-level API." into gingerbread

* commit '0f74afbbf4bd0fe35889e26fc46f94c4ca6382d8':
  Remove Type X Tags from the top-level API.