Merge "Potential fix for NPE in Running services." into ics-mr1