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

* commit 'fa81de9b9c561a73216f16b2fd62c6f2042b8090':
  Potential fix for NPE in Running services.