fix user handshake callback bug

Change-Id: Ia934e521e16fbe108f84551858f9ac22c09494fe