Merge "Correct the API comments." into honeycomb