Merge "Fix the comments of onError() callback"
am: 5f291e5e06

Change-Id: If034888c0baeaae882e150eff477083974541541