connectionService return uid

Change-Id: Id51b33ed0bd838e0d3f690711f363df534a98ce5
Merge "connectionService return uid" into 0.6.x