Handle null values in registerService

Bug: 17491971
Change-Id: I0443a9accd86ab70510d16456a03912845718ca9
1 file changed