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

* commit '614c653b7a2da14ded7d9c95142a5afd0b4d4722':
  Handle null values in registerService