Merge "Fix NPE in retrieveServiceLocked()"