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

Change-Id: I949d1c3ed1155af86e19428ca1e4877303baaaa7