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

Change-Id: I0c9e33c10ce673ed00bfe97b38ae671548d21201