am cc16024f: Merge "Differentiate between system_server and unknown." into ics-mr1

* commit 'cc16024f101c0fca211fcd069b3917becf7a3c00':
  Differentiate between system_server and unknown.