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

Change-Id: Ia4daace16cbd62c01aa4e6287ad4e55297e7f2a0