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

* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
  Use hidden visibility for several internal-use-only functions.