Update for IClientCallback
am: d8536200ab

Change-Id: I4ebf2a5566b2f8af4d7eca41dbe7917f33cb7c18