Merge "Fix the API comments according to comments in http://ag/9554748."