am 4b9adfbe: Merge "Correct the API comments." into honeycomb

* commit '4b9adfbe7d0cf578b82eb7794c506ad1986854b9':
  Correct the API comments.