The documented return type was not what existing callers expected,
and not what the default implementation actually returned.
This patch fixes the interface documentation and the behavior of
an alternative implementation.
Change-Id: Ib09bffeba3ddc5b43da1c7c299f1fa946be4e2e2
