am fa33fb11: Merge "Clean up unnecessary wrap functions."

* commit 'fa33fb113275a4e78cb635f159760bcebf8cfe3c':
  Clean up unnecessary wrap functions.