Add clientidbase and fix build

Change-Id: I53115954b929a69faacdf0a989973d079e06e3fe