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

Change-Id: I54a9769dc9c62bce97205fe534f38cf27d0a5f8b