Merge "fix NullPointerException in RegisteredServicesCache" am: 4b1a8f46d6
am: 506bf0741a

Change-Id: I0ec538fc78a512441517d1205ac3d34232ce992e