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

* commit '2cd221c9297f1b858ce5c709644e8b0fa329d0df':
  Correct the API comments.