Merge "Log before stopping/removing the current client" into pi-dev
am: 7b3e68232c

Change-Id: I8f669a41d60d18af911ff88380bd254521c99b47