Merge "Cleanup ServiceState.toString()" am: ee6e43c033
am: 5b30d7b819

Change-Id: I2edcce0e4e66dbb5840db7f2d3c6c0fa0855f09e