Merge "Fix the comments of onError() callback"