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