Additional changes for clientid record.

Signed-off-by: Rong Zeng <rongzeng@us.ibm.com>