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

* commit '76a2d4ef3e70aa986ca9fff9f77c2af053679c4b':
  Clean up unnecessary wrap functions.