am 85049ead: Merge "Use hidden visibility for several internal-use-only functions."

* commit '85049ead251b0af9411ada3ad1db0f6b75f8e4a8':
  Use hidden visibility for several internal-use-only functions.