Fix a message that is not client name free

Change-Id: I659e4650f445c8f8d666df3ed8f49ad252a1f7a6
Merge "Fix a message that is not client name free"