Merge "Fixed mClientState dump." into pi-dev
am: 8b08d54869

Change-Id: If36606536a0971346c18f211b11053c61754d70e