am 26c2646a: Merge "Modified functions to return pointers where appropriate"

* commit '26c2646a85a7929edcc330ace7769a179ec37663':
  Modified functions to return pointers where appropriate