am 24e194ff: am 1078ab10: API Cleanup: return types and consitent function names

* commit '24e194ffe2112b41d378c48c4df89c141b9de7ae':
  API Cleanup: return types and consitent function names