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

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