Merge "Add emergencyOnly indicator in ServiceState." into froyo