am adeec096: Merge "Hide various symbols that shouldn\'t be exposed."

* commit 'adeec096292a3ad63767f13af04836249ecbc075':
  Hide various symbols that shouldn't be exposed.