Merge "Fix NPE in ServiceTest" into ics-mr0