Merge "fix NullPointerException in RegisteredServicesCache"
am: 4b1a8f46d6

Change-Id: I1ba9512647d515aedbaf09eb2d7ac524477e5296