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

* commit '03dc51b1a07c7d79f1d12751b19ebda044857333':
  Remove Type X Tags from the top-level API.