am d23a87d3: am 8c181aa8: Merge "Use hidden visibility for internal-use-only functions"

* commit 'd23a87d3b1c7269a4b55f082555790a3003ba228':
  Use hidden visibility for internal-use-only functions