add handshake and hearbeat

Change-Id: Idfcce12255a5cdeb0891844ac0b6a158143dc5ce
Merge "add handshake and hearbeat" into 0.3.x