Merge console_output_client to server_client

Change-Id: Iae11ef91c426dc4c12996b1b815ce09a1f6c0d18
Merge "Merge console_output_client to server_client"