am 1fdb5100: Merge "Handle null values in registerService" into lmp-dev

* commit '1fdb5100feab055ca9e52ee766d4477a188e78a3':
  Handle null values in registerService