am 638e6f06: Clean up ApiHelper and remove unused code paths.

* commit '638e6f06c877d90b907f66ea9c22b3c6b73c7384':
  Clean up ApiHelper and remove unused code paths.